Merge from emacs-24; up to r111353
authorGlenn Morris <rgm@gnu.org>
Sat, 1 Jun 2013 20:21:22 +0000 (13:21 -0700)
committerGlenn Morris <rgm@gnu.org>
Sat, 1 Jun 2013 20:21:22 +0000 (13:21 -0700)
commit7b0527c244e15a4e668466d9806bc4f9b0f6404d
tree682b49e1925a3ce77f608be8900b66b9c30b14c3
parent7515c2053921817a630eb794d64334ea28b1b7a5
parenta54fd2197dffbdca4984152e681e50b1b0e6e49c
Merge from emacs-24; up to r111353
doc/emacs/ChangeLog
lisp/ChangeLog
lisp/progmodes/python.el